projects
/
ostree.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ba1c75c
)
Revert "manifest local"
author
Colin Walters
<walters@verbum.org>
Sat, 5 May 2012 14:42:56 +0000
(10:42 -0400)
committer
Colin Walters
<walters@verbum.org>
Sat, 5 May 2012 14:42:56 +0000
(10:42 -0400)
This reverts commit
b05275865206acaf6b991212208984df878d86ba
.
Conflicts:
gnomeos/3.4/gnomeos-3.4-src.json
gnomeos/3.4/gnomeos-3.4-src.json
patch
|
blob
|
history
diff --git
a/gnomeos/3.4/gnomeos-3.4-src.json
b/gnomeos/3.4/gnomeos-3.4-src.json
index f58a5ea2f3f671603f93e5ceb79f69721194ac4c..df986a32dddac945ac813dab84d341ca8da80d5d 100644
(file)
--- a/
gnomeos/3.4/gnomeos-3.4-src.json
+++ b/
gnomeos/3.4/gnomeos-3.4-src.json
@@
-26,8
+26,7
@@
"netfilter": "git:git://git.netfilter.org/",
"cgwalters": "git:git://github.com/cgwalters/"},
- "patches": {"src": "git:/src/ostree",
- "branch": "wip/ostbuild-v2",
+ "patches": {"src": "gnome:ostree",
"subdir": "gnomeos/3.4"},
"components": [
@@
-574,8
+573,7
@@
{"src": "gnome:libsoup",
"config-args": ["--disable-tls-check"]},
- {"src": "git:/src/ostree",
- "branch": "wip/ostbuild-v2",
+ {"src": "gnome:ostree",
"config-opts": ["--disable-documentation",
"--with-soup-gnome"]},